From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 12 Feb 2011 22:40:06 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~2383^2~11
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6d302144c218f12bd380344ae2d3ed87a6ea9327;p=emacs.git

Merge from mainline.
---

6d302144c218f12bd380344ae2d3ed87a6ea9327